(split-window-save-restore-data):

Don't update the data if OLD-INFO is nil.

diff --git a/lisp/window.el b/lisp/window.el
index 91b91cfb158766a10f3a1d3353eb33e170a76c7d..2b5a4ab161d3c0b2f5ce8a9f9fb7a62f00560a28 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -327,8 +327,9 @@ new mode line."
   (with-current-buffer (window-buffer)
     (if view-mode
        (let ((old-info (assq old-w view-return-to-alist)))
-         (push (cons new-w (cons (and old-info (car (cdr old-info))) t))
-               view-return-to-alist)))
+         (if old-info
+             (push (cons new-w (cons (car (cdr old-info)) t))
+                   view-return-to-alist))))
     new-w))
 
 (defun split-window-horizontally (&optional arg)